Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Mon, 21 Sep 2009 22:35:19 +0000 (00:35 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 21 Sep 2009 22:35:19 +0000 (00:35 +0200)
commitc2d7c605ad5ccca020375fb370cdceb93cd171d5
treedd2db290ea76a528d3a17959ad7253d158251c29
parent27ba04b933692f6e5e6df0e36703d3b209541f4c
parent2934297312f65130e2184cbf5d3530e9d058fdfa
Merge branch 'upstream'